Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

placementinsql: add the survival preferences docs #12682

Merged
merged 22 commits into from
Feb 15, 2023
Merged

placementinsql: add the survival preferences docs #12682

merged 22 commits into from
Feb 15, 2023

Conversation

nolouch
Copy link
Member

@nolouch nolouch commented Jan 16, 2023 •
edited
Loading

Signed-off-by: nolouch nolouch@gmail.com

First-time contributors' checklist

What is changed, added or deleted? (Required)

Which TiDB version(s) do your changes apply to? (Required)

wait pingcap/tidb#40613

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v6.6 (TiDB 6.6 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.4 (TiDB 6.4 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 16, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • SunRunAway
  • hfxsd

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 16, 2023
@ti-chi-bot ti-chi-bot requested a review from TomShawn January 16, 2023 09:21
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 16, 2023
@nolouch nolouch force-pushed the add-survival-preference branch from fc549f2 to e3ffd83 Compare January 16, 2023 09:24
@qiancai qiancai requested review from qiancai and removed request for TomShawn January 16, 2023 09:25
@qiancai qiancai added v6.6 translation/doing This PR’s assignee is translating this PR. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jan 16, 2023
@ti-chi-bot ti-chi-bot removed the missing-translation-status This PR does not have translation status info. label Jan 16, 2023
@qiancai qiancai added missing-translation-status This PR does not have translation status info. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jan 16, 2023
@nolouch nolouch assigned xhebox and unassigned xhebox Jan 16, 2023
@nolouch nolouch requested a review from xhebox January 16, 2023 09:26
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 16, 2023
@nolouch
placementinsql: add the survival preferences docs
3aaa996 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch nolouch force-pushed the add-survival-preference branch from e3ffd83 to 3aaa996 Compare January 16, 2023 09:28
@qiancai qiancai removed the missing-translation-status This PR does not have translation status info. label Jan 16, 2023
qiancai
qiancai reviewed Jan 28, 2023
View reviewed changes
placement-rules-in-sql.md Outdated Show resolved Hide resolved
qiancai
qiancai reviewed Jan 28, 2023
View reviewed changes
placement-rules-in-sql.md Outdated Show resolved Hide resolved
qiancai
qiancai reviewed Jan 28, 2023
View reviewed changes
placement-rules-in-sql.md Outdated Show resolved Hide resolved
qiancai
qiancai reviewed Jan 28, 2023
View reviewed changes
placement-rules-in-sql.md Outdated Show resolved Hide resolved
@nolouch @SunRunAway
Update placement-rules-in-sql.md
ba67b1e 
Co-authored-by: Feng Liyuan <darktemplar.f@gmail.com>
@qiancai @hfxsd
Update placement-rules-in-sql.md
67fde09 
Co-authored-by: xixirangrang <hfxsd@hotmail.com>
@nolouch
address comments
d2516ef 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch
Merge remote-tracking branch 'nolouch/add-survival-preference' into a…
e16ea40 
…dd-survival-preference

Conflicts:
	placement-rules-in-sql.md
@nolouch nolouch force-pushed the add-survival-preference branch from fda84d9 to 2529934 Compare February 13, 2023 10:45
@nolouch
tiny change
554f0fc 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch nolouch force-pushed the add-survival-preference branch from 12b0d10 to 554f0fc Compare February 13, 2023 10:53
@nolouch
tiny change
d285bf3 
Signed-off-by: nolouch <nolouch@gmail.com>
qiancai
qiancai reviewed Feb 13, 2023
View reviewed changes
placement-rules-in-sql.md Outdated Show resolved Hide resolved
placement-rules-in-sql.md Outdated Show resolved Hide resolved
placement-rules-in-sql.md Outdated Show resolved Hide resolved
placement-rules-in-sql.md Outdated Show resolved Hide resolved
@nolouch
address comments
a5c6d8d 
Signed-off-by: nolouch <nolouch@gmail.com>
qiancai
qiancai reviewed Feb 13, 2023
View reviewed changes
placement-rules-in-sql.md Outdated Show resolved Hide resolved
placement-rules-in-sql.md Outdated Show resolved Hide resolved
nolouch and others added 2 commits February 14, 2023 12:40
@nolouch @qiancai
Update placement-rules-in-sql.md
01c6447 
Co-authored-by: Grace Cai <qqzczy@126.com>
@nolouch @qiancai
Update placement-rules-in-sql.md
83bb7cf 
Co-authored-by: Grace Cai <qqzczy@126.com>
qiancai
qiancai reviewed Feb 14, 2023
View reviewed changes
placement-rules-in-sql.md Outdated Show resolved Hide resolved
@nolouch @qiancai
Update placement-rules-in-sql.md
eef7984 
Co-authored-by: Grace Cai <qqzczy@126.com>
qiancai
qiancai reviewed Feb 14, 2023
View reviewed changes
placement-rules-in-sql.md Outdated Show resolved Hide resolved
hfxsd
hfxsd reviewed Feb 14, 2023
View reviewed changes
placement-rules-in-sql.md Outdated Show resolved Hide resolved
placement-rules-in-sql.md Outdated Show resolved Hide resolved
@qiancai @hfxsd
wording updates
2f29bf9 
Co-authored-by: xixirangrang <hfxsd@hotmail.com>
qiancai
qiancai approved these changes Feb 14, 2023
View reviewed changes
Copy link
Collaborator

@qiancai qiancai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@qiancai
Copy link
Collaborator

qiancai commented Feb 15, 2023

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 0e67476

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 15, 2023
@qiancai qiancai removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 15, 2023
@ti-chi-bot ti-chi-bot merged commit 421236a into pingcap:master Feb 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qiancai qiancai qiancai approved these changes

@hfxsd hfxsd hfxsd approved these changes

@SunRunAway SunRunAway SunRunAway approved these changes

@xhebox xhebox Awaiting requested review from xhebox

Assignees

@qiancai qiancai

Labels
size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. v6.6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@nolouch @ti-chi-bot @qiancai @SunRunAway @hfxsd @xhebox @TomShawn